Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:55:36 +0000 (22:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 05:55:36 +0000 (22:55 -0700)
commit8af35b7301a827a8a391be20ecd9e2b37c225ab1
treedc0f5e8379af3b839ba1bab703d225bd46ae9489
parent9cdb99d89618ebbb722646f22aedc99da177a454
parentb8aff49f994759bded9c8f832658eb80dea85c5f
Merge from trunk.